From a1e2dc0e7425afd630e8971e2c415da74dccec69 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Tue, 28 Feb 2006 12:23:46 -0700 Subject: [PATCH] [IA64] delivery_mask removed (was unused). The field was renamed in arch-ia64.h for backward compatibility with xen linux. Signed-off-by: Tristan Gingold --- xen/arch/ia64/asm-xsi-offsets.c | 2 -- xen/arch/ia64/xen/domain.c | 7 ------- xen/arch/ia64/xen/vcpu.c | 3 --- xen/include/public/arch-ia64.h | 2 +- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/xen/arch/ia64/asm-xsi-offsets.c b/xen/arch/ia64/asm-xsi-offsets.c index aef06d7702..c002c2a364 100755 --- a/xen/arch/ia64/asm-xsi-offsets.c +++ b/xen/arch/ia64/asm-xsi-offsets.c @@ -84,8 +84,6 @@ void foo(void) DEFINE(XSI_PEND, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, pending_interruption))); DEFINE(XSI_INCOMPL_REGFR_OFS, offsetof(mapped_regs_t, incomplete_regframe)); DEFINE(XSI_INCOMPL_REGFR, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, incomplete_regframe))); - DEFINE(XSI_DELIV_MASK0_OFS, offsetof(mapped_regs_t, delivery_mask[0])); - DEFINE(XSI_DELIV_MASK0, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, delivery_mask[0]))); DEFINE(XSI_METAPHYS_OFS, offsetof(mapped_regs_t, metaphysical_mode)); DEFINE(XSI_METAPHYS, (SHARED_ARCHINFO_ADDR+offsetof(mapped_regs_t, metaphysical_mode))); diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index a85b9725a3..93b5d87c77 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -974,13 +974,6 @@ int construct_dom0(struct domain *d, // FIXME: Hack for keyboard input serial_input_init(); - if (d == dom0) { - VCPU(v, delivery_mask[0]) = -1L; - VCPU(v, delivery_mask[1]) = -1L; - VCPU(v, delivery_mask[2]) = -1L; - VCPU(v, delivery_mask[3]) = -1L; - } - else __set_bit(0x30, VCPU(v, delivery_mask)); return 0; } diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index 9c9bf5c824..b5f5043786 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -651,7 +651,6 @@ void vcpu_pend_interrupt(VCPU *vcpu, UINT64 vector) set_bit(vector,VCPU(vcpu,irr)); } else { - /* if (!test_bit(vector,PSCB(vcpu,delivery_mask))) return; */ if (test_bit(vector,PSCBX(vcpu,irr))) { //printf("vcpu_pend_interrupt: overrun\n"); } @@ -691,7 +690,6 @@ check_start: vcpu_pend_interrupt(vcpu, vcpu->vcpu_info->arch.evtchn_vector); p = &PSCBX(vcpu,irr[3]); - /* q = &PSCB(vcpu,delivery_mask[3]); */ r = &PSCBX(vcpu,insvc[3]); for (i = 3; ; p--, q--, r--, i--) { bits = *p /* & *q */; @@ -994,7 +992,6 @@ void vcpu_enable_timer(VCPU *vcpu,UINT64 cycles) vcpu_set_next_timer(vcpu); printf("vcpu_enable_timer: interval set to %lu cycles\n", PSCBX(vcpu,xen_timer_interval)); - __set_bit(PSCB(vcpu,itv), PSCB(vcpu,delivery_mask)); } IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT64 val) diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h index a1013e3112..d2ac90d821 100644 --- a/xen/include/public/arch-ia64.h +++ b/xen/include/public/arch-ia64.h @@ -249,7 +249,7 @@ typedef struct { int interrupt_delivery_enabled; // virtual psr.i int pending_interruption; int incomplete_regframe; // see SDM vol2 6.8 - unsigned long delivery_mask[4]; + unsigned long reserved5_1[4]; int metaphysical_mode; // 1 = use metaphys mapping, 0 = use virtual int banknum; // 0 or 1, which virtual register bank is active unsigned long rrs[8]; // region registers -- 2.30.2